Remove unused static function. (xpm_skip_string): Dito.

2001-11-14  Daniel Egger  <degger@fhm.edu>

	* gdk-pixbuf/io-xpm.c:
	(xpm_skip_whitespaces): Remove unused static function.
	(xpm_skip_string): Dito.
	(xpm_extract_color): Declare const variable const to avoid warnings.

	* gtk/gtkfixed.c: (gtk_fixed_map): Remove unused static function.

	* gtk/gtkplug.c: #if 0'ed prototype for #if 0'ed code.

	* gtk/gtksocket.c: Change type of mask to g_message to %ld for
	a long.

diff --git a/ChangeLog b/ChangeLog
index 504d6fbc8c89eec3d941e3d104c0c9b7584ce8de..e9c0ae1776f6bb2360434fff7bf082c2bfbacf9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-11-14  Daniel Egger  <degger@fhm.edu>
+
+       * gdk-pixbuf/io-xpm.c: 
+       (xpm_skip_whitespaces): Remove unused static function.
+       (xpm_skip_string): Dito.        
+       (xpm_extract_color): Declare const variable const to avoid warnings. 
+
+       * gtk/gtkfixed.c: (gtk_fixed_map): Remove unused static function.
+       
+       * gtk/gtkplug.c: #if 0'ed prototype for #if 0'ed code.
+       
+       * gtk/gtksocket.c: Change type of mask to g_message to %ld for 
+       a long.
+
 Wed Nov 14 15:14:48 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 504d6fbc8c89eec3d941e3d104c0c9b7584ce8de..e9c0ae1776f6bb2360434fff7bf082c2bfbacf9b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,17 @@
+2001-11-14  Daniel Egger  <degger@fhm.edu>
+
+       * gdk-pixbuf/io-xpm.c: 
+       (xpm_skip_whitespaces): Remove unused static function.
+       (xpm_skip_string): Dito.        
+       (xpm_extract_color): Declare const variable const to avoid warnings. 
+
+       * gtk/gtkfixed.c: (gtk_fixed_map): Remove unused static function.
+       
+       * gtk/gtkplug.c: #if 0'ed prototype for #if 0'ed code.
+       
+       * gtk/gtksocket.c: Change type of mask to g_message to %ld for 
+       a long.
+
 Wed Nov 14 15:14:48 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 504d6fbc8c89eec3d941e3d104c0c9b7584ce8de..e9c0ae1776f6bb2360434fff7bf082c2bfbacf9b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+2001-11-14  Daniel Egger  <degger@fhm.edu>
+
+       * gdk-pixbuf/io-xpm.c: 
+       (xpm_skip_whitespaces): Remove unused static function.
+       (xpm_skip_string): Dito.        
+       (xpm_extract_color): Declare const variable const to avoid warnings. 
+
+       * gtk/gtkfixed.c: (gtk_fixed_map): Remove unused static function.
+       
+       * gtk/gtkplug.c: #if 0'ed prototype for #if 0'ed code.
+       
+       * gtk/gtksocket.c: Change type of mask to g_message to %ld for 
+       a long.
+
 Wed Nov 14 15:14:48 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 504d6fbc8c89eec3d941e3d104c0c9b7584ce8de..e9c0ae1776f6bb2360434fff7bf082c2bfbacf9b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+2001-11-14  Daniel Egger  <degger@fhm.edu>
+
+       * gdk-pixbuf/io-xpm.c: 
+       (xpm_skip_whitespaces): Remove unused static function.
+       (xpm_skip_string): Dito.        
+       (xpm_extract_color): Declare const variable const to avoid warnings. 
+
+       * gtk/gtkfixed.c: (gtk_fixed_map): Remove unused static function.
+       
+       * gtk/gtkplug.c: #if 0'ed prototype for #if 0'ed code.
+       
+       * gtk/gtksocket.c: Change type of mask to g_message to %ld for 
+       a long.
+
 Wed Nov 14 15:14:48 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 504d6fbc8c89eec3d941e3d104c0c9b7584ce8de..e9c0ae1776f6bb2360434fff7bf082c2bfbacf9b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+2001-11-14  Daniel Egger  <degger@fhm.edu>
+
+       * gdk-pixbuf/io-xpm.c: 
+       (xpm_skip_whitespaces): Remove unused static function.
+       (xpm_skip_string): Dito.        
+       (xpm_extract_color): Declare const variable const to avoid warnings. 
+
+       * gtk/gtkfixed.c: (gtk_fixed_map): Remove unused static function.
+       
+       * gtk/gtkplug.c: #if 0'ed prototype for #if 0'ed code.
+       
+       * gtk/gtksocket.c: Change type of mask to g_message to %ld for 
+       a long.
+
 Wed Nov 14 15:14:48 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 504d6fbc8c89eec3d941e3d104c0c9b7584ce8de..e9c0ae1776f6bb2360434fff7bf082c2bfbacf9b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+2001-11-14  Daniel Egger  <degger@fhm.edu>
+
+       * gdk-pixbuf/io-xpm.c: 
+       (xpm_skip_whitespaces): Remove unused static function.
+       (xpm_skip_string): Dito.        
+       (xpm_extract_color): Declare const variable const to avoid warnings. 
+
+       * gtk/gtkfixed.c: (gtk_fixed_map): Remove unused static function.
+       
+       * gtk/gtkplug.c: #if 0'ed prototype for #if 0'ed code.
+       
+       * gtk/gtksocket.c: Change type of mask to g_message to %ld for 
+       a long.
+
 Wed Nov 14 15:14:48 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 504d6fbc8c89eec3d941e3d104c0c9b7584ce8de..e9c0ae1776f6bb2360434fff7bf082c2bfbacf9b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+2001-11-14  Daniel Egger  <degger@fhm.edu>
+
+       * gdk-pixbuf/io-xpm.c: 
+       (xpm_skip_whitespaces): Remove unused static function.
+       (xpm_skip_string): Dito.        
+       (xpm_extract_color): Declare const variable const to avoid warnings. 
+
+       * gtk/gtkfixed.c: (gtk_fixed_map): Remove unused static function.
+       
+       * gtk/gtkplug.c: #if 0'ed prototype for #if 0'ed code.
+       
+       * gtk/gtksocket.c: Change type of mask to g_message to %ld for 
+       a long.
+
 Wed Nov 14 15:14:48 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back

diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index 2505ddba1748853f7f4fab1af26b3c6edeb0f957..583b05aad3fb23e33c2e3825877188ecd018758c 100644 (file)
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -1070,39 +1070,17 @@ xpm_read_string (FILE *infile, gchar **buffer, guint *buffer_size)
        return ret;
 }
 
-static const gchar *
-xpm_skip_whitespaces (const gchar *buffer)
-{
-       gint32 index = 0;
-
-       while (buffer[index] != 0 && (buffer[index] == 0x20 || buffer[index] == 0x09))
-               index++;
-
-       return &buffer[index];
-}
-
-static const gchar *
-xpm_skip_string (const gchar *buffer)
-{
-       gint32 index = 0;
-
-       while (buffer[index] != 0 && buffer[index] != 0x20 && buffer[index] != 0x09)
-               index++;
-
-       return &buffer[index];
-}
-
 static gchar *
 xpm_extract_color (const gchar *buffer)
 {
+       const gchar *p = &buffer[0];
        gint new_key = 0;
        gint key = 0;
        gint current_key = 1;
        gint space = 128;
        gchar word[128], color[128], current_color[128];
-       gchar *r, *p;
-
-       p = &buffer[0];
+       gchar *r; 
+       
        word[0] = '\0';
        color[0] = '\0';
        current_color[0] = '\0';

diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index 7e3cdff7d20752d90a6a61a36a6ffa4e1856a0b6..2295d286f60e94115077ecf5af0a8bf0ed6bc5a0 100644 (file)
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -303,30 +303,6 @@ gtk_fixed_get_child_property (GtkContainer *container,
     }
 }
 
-static void
-gtk_fixed_map (GtkWidget *widget)
-{
-  GtkFixed *fixed;
-  GtkFixedChild *child;
-  GList *children;
-
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-  fixed = GTK_FIXED (widget);
-
-  children = fixed->children;
-  while (children)
-    {
-      child = children->data;
-      children = children->next;
-
-      if (GTK_WIDGET_VISIBLE (child->widget) &&
-         !GTK_WIDGET_MAPPED (child->widget))
-       gtk_widget_map (child->widget);
-    }
-
-  gdk_window_show (widget->window);
-}
-
 static void
 gtk_fixed_realize (GtkWidget *widget)
 {

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index ed9ef18123f99063b70146fb72996002bfd9cafc..c590e752eb94de79d39bd00b591924eb21cdd406 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -61,7 +61,9 @@ static GdkFilterReturn gtk_plug_filter_func           (GdkXEvent        *gdk_xev
                                                       GdkEvent         *event,
                                                       gpointer          data);
 
+#if 0
 static void gtk_plug_free_grabbed_keys (GHashTable    *key_table);
+#endif
 static void handle_modality_off        (GtkPlug       *plug);
 static void send_xembed_message        (GtkPlug       *plug,
                                        glong          message,

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index c8802c2e6ac32f54eb55268a103fd1e7fbd72b4c..a617467e688c054ff329ed3900e4380abd12fbad 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -1071,7 +1071,7 @@ send_xembed_message (GtkSocket *socket,
                     guint32    time)
 {
   GTK_NOTE(PLUGSOCKET,
-          g_message ("GtkSocket: Sending XEMBED message of type %d", message));
+        g_message ("GtkSocket: Sending XEMBED message of type %ld", message));
   
   if (socket->plug_window)
     {